Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging
authorIan Jackson <ian.jackson@eu.citrix.com>
Thu, 11 Apr 2013 12:18:40 +0000 (13:18 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 11 Apr 2013 12:18:40 +0000 (13:18 +0100)

Trivial merge